Merge 06d75879179b9eebb51ca534d6f0906f3b5d69a2 on remote branch

Change-Id: I8fedb04daf06c10ac39e3192f22e4d5a4c50a195