Merge 736bc8e901d142dd47cd1987f4fbae99e8a61bd2 on remote branch

Change-Id: Ied90e0bf1c33214bf12cc5596feeb8ea0e5bfe9f