Merge 0ea8fee60a6cd163da5ecfe44255a5a12901210a on remote branch

Change-Id: I109750a74469610f58305c332357816d808a6313