Merge 4b8e3877384c0df8717b8332d0057c30cf4739c0 on remote branch

Change-Id: I8ade5821e1055a8367040e96129194f7044049f0