Merge 809c4ae866b9528ac15b3f4015c3ff79bfe39b89 on remote branch

Change-Id: I823465df4de26e2171633087f36f8d77200e18ca