Merge 39030370ea5c690bad7981dce94086eaac7aa6ab on remote branch

Change-Id: I5bef928d5d5c658a7c3d28481037278545ae7d66