Merge f03b4b6589044f4395f904867513f954a9a199a6 on remote branch

Change-Id: I3514223d3af44d6ba16bcd4a10ea2a195aaa0df0