Merge cdc2b2359406303ee41a283327eb3a28545168bf on remote branch

Change-Id: I21397f04dc09dace8c4c82a3de8345141cd5357a