Merge 4e5dda45d661e25cc44399900aaa629537834153 on remote branch

Change-Id: I5a4456667c05d79d2e6f1e369a379384cee8bd63