Merge 3fc301fdba623600b670b80a9a4ff5eb2420529b on remote branch

Change-Id: Ib79ec1217779e99b72b4fd0a4cebd18e501c5b4a