Merge 8dfa121c4bed8e32eb026e3b772dd587e6446bd9 on remote branch

Change-Id: I76042f2e242039ba3b346df28144a3a21a03993a