Merge 0e9369a6c035d08950b9491f36dedadc8b6ebf46 on remote branch

Change-Id: I1d01582294087beeffa1dab820018cff7042600f