Merge bcc79f25b3d604fdc729908c5ac4cd8fb22c7afd on remote branch

Change-Id: I14914adb93b2e2fe9434dcdecb9053e442a1823f