Merge 07ce7700d481304b635e6928dedbb34c9b80b497 on remote branch

Change-Id: Ib8e289c8905a9ddf26a85a39a9f0010def8d92b6