Merge 4fe5b3a4c4e92839ef0ba767b4a7b591332adad6 on remote branch

Change-Id: I5d5268e907ebf01697bee6a0b6d3735eb3ddf7e2