Merge 9b5b241992c8983172a74e6acdfeb2aee61be4ff on remote branch

Change-Id: If76f974020ec1e32d96229136244993e7dc557a2