Merge bf125820ed4e517e412427307fa5960679e8600f on remote branch

Change-Id: Iaed4c703488f6a926bb1bb94cbf15fe35d3f16b1