Merge a1928e9c6db94c74a77d88d1736a3a1d13c5cde7 on remote branch

Change-Id: Id46e679b4b800b8cfc803720ebe03f59e67fbd5a