Merge 41eca4930d25a9a4ad269eab09eb80826ee2bae1 on remote branch

Change-Id: I7bfa8af17a8a6890caa53263fea2e61642de9612