Merge 6c7044b7d2debd71bd6dad7f204f92da3b216639 on remote branch

Change-Id: I440e5b780e818bc7c8dfa682e7b1ef6fb52a894c