Merge changes Iaf918ce3,I60032b97
am: 2efe92bdbe

Change-Id: I076249c9ccf563905c52b272a8c25c14da8e5711