Merge 19f7c2a87dc17bb3f4ac440f92e58cd2180bb90e on remote branch

Change-Id: Iea913fc52548c64dcea286b536ed4bda8dedb513