Merge 507cbfcca3ee791c30b6bafb6b5b8706da8f57f0 on remote branch

Change-Id: Ibda621ccf252e846197514361e6e3c9dbf3a68fa