Merge 4a6aff442eb253a0ef28fb68af6ff62ea02d26bc on remote branch

Change-Id: I949914621840f7b2e155ad2178b90abdbd1dbf35