Merge 7b85bde5239d909f0fae9660668fbc47d5fc7027 on remote branch

Change-Id: I636f1b472f074139db0a91853546ba64fedfe873