Merge 43f9fb96931b4d2120bf20377a162f6eda592217 on remote branch

Change-Id: Ifd37ebed5a82fef702a9c8018367f87c89682c2b