Merge d4fd44993ecac4a2409a69b056df822120d59c46 on remote branch

Change-Id: Ie81a7ae666f6f03fefcacecddc4b1e40c9d54bea