Merge c40430c299f4694692553132086854b03eba3e52 on remote branch

Change-Id: Idb0831563ea664d9ef923e094ac9115a47e6d8d9