Merge fbe5276a8fbdecd027d2278f4e7902ad8a3df049 on remote branch

Change-Id: Ibd77150123bf10348b75dc4474d327c49edb07f8