Merge c6adf855524d4636bc94a11e7b4954feb0151ba3 on remote branch

Change-Id: I9a7c1a6e7d43ccdc1cc66f98aa26fcb4ef4ced81