Merge 689abf7ee0a73701afada48286feb0ba1de0b823 on remote branch

Change-Id: I7af56ab99d22ab246ee01ae5b030c5d90d9bd61c