Merge c960dbfe6e157d50b19ed0cabdf14d3e342c777b on remote branch

Change-Id: I8fa9afd06ffbbcc797624dfe1b42f74cfbe87aa8