Merge b0a7a6100356c93808c997d8f0cc2d18b13c2b42 on remote branch

Change-Id: I7bbabe7f724e11644a26685aaec954bb1857db52