Merge 60eabe699115e5b7fbb9f6a6baa6e409aab18872 on remote branch

Change-Id: I1345d10cb381b2bdd52f753bb21e88495dc9d696