Merge 0bed6311d348a1daf1645bcc3e52ea62f8596ffa on remote branch

Change-Id: Ie6c98f8e46a4fb8a3aedb6a47428a5d390edc40f