Merge 8f0102c204730626b9dd469f09c62a673d2af349 on remote branch

Change-Id: I93ad4b6216a3b73b1191e71c45377edd18418744