Merge bcc79f25b3d604fdc729908c5ac4cd8fb22c7afd on remote branch

Change-Id: I2210eb3840a27b755a36c1faac69295d1bc9011a