Merge 345626f8b1d703204519b4568e835eb7c68c12d0 on remote branch

Change-Id: I32ac03c1f16991c233798988730ec6e36c44a664