Merge 352880fc4076ec9f36429078ed6a21904f5034e2 on remote branch

Change-Id: I11d68845bfc11b98b0ff04936a4ffe6cacf34c48