Merge 6e9efbbfa8cc1090c7cebc13160c286a4669df1a on remote branch

Change-Id: I35af09fec412030b968ecf2f742179b844b4bd60