Merge b4ee54543a60e109890612ef1737dabf04b08072 on remote branch

Change-Id: I1b0c5bd947174a287d860085d6245334305ec75e