Merge 1aee8389bb762987399a7c588bba37d55a3e17b6 on remote branch

Change-Id: Ia5a8e22292c8c085f9aed8eab0fc41a1e7fd4639