Merge 6c564b0c6126393633e0740a91bbe0d2444fab7a on remote branch

Change-Id: Ib1da7aa2101a1835b64e333b53c5f6110dc9148c