Merge commit 'e079778c6b1c7063c661f50af0e5393579df2b00' into b77882292

Change-Id: I79599dabd405bcb9ae089e110c3ae8259379eda7