Merge commit '34be23373b9e73694c3b214ba857283bad65aedb' into HEAD am: 9653fde9e5 am: 13918d9516

Change-Id: Iba12b52bda6718e587075a4cf2ca485026b49bec