Merge 6a345ec46a4d1ea16cfd8d50faebf86e56d5dd34 on remote branch

Change-Id: Id09865820d34fbbc8500608f1347f19d05872abd