Merge df8b6044bbd2a3faa8f64b9a429e6e7dda2be1d7 on remote branch

Change-Id: I0cc5d679e252d24975a9994ad7bc309fb8b5006c