Merge 43ba7bdf5522f1364013d0eaa4a3b57edeb9c581 on remote branch

Change-Id: I3318d02d483a3ec60d73cdb39b8955db189eec7f