Merge 5257c3604660511fc51302aa9d9ef72cb0e6f49b on remote branch

Change-Id: Ic3c784d0e2c2efb9376e1def6600813a96fb24d6