Merge changes Ic7d75e1e,Iaf828034
am: 467610e9b9

Change-Id: I9bb6da1caf637984ac918bc1cd5cab1f831eca16