Merge cca60f61a7d479738187b411cfb01fef6f37a412 on remote branch

Change-Id: I184ae78a5f9d5969ffeb8819c3a7b960f236fa45