Merge 168b878b5a0435dc56668b684b94904c4312fd09 on remote branch

Change-Id: I0953c01a5562cde228d521ddc15d03cccbbc7fca