Merge b9ecc691d04e4f0ddc2625ebcdf8f8625121be04 on remote branch

Change-Id: Ib90f9d1e52bc96ed8e7c6eb9cf9e26799d210821