Merge changes Ic7d75e1e,Iaf828034 am: 467610e9b9
am: 02cab224f0

Change-Id: I464e05c473aa28bdc8054a457555d01a3ba36e03