Merge d84dee0a0ef06473c9d87926c44e6798f23ba82a on remote branch

Change-Id: Ibc1557e5f1402866907942493f6571e1299ab3f3