Merge 1a979ff603569532cb8b123c7d667f46224a4486 on remote branch

Change-Id: I170a8dd885efb6b3fd6d595584fa78f7cfc3dcf8