Merge cceee494ba2ee1dacb5e2b0ac1f7799750f6c2d0 on remote branch

Change-Id: Ib0caeecaf64bf3308db71e27833ac2a2a14e33bc