Merge 51905b4794b21471cf74bd578256e856134478b8 on remote branch

Change-Id: If0d85014bbc6e8c8bb84456909b3f2375df05298