Merge d4a6b99ecaf307fa496b4200474a26b6eaafcd6a on remote branch

Change-Id: I8534f8018ed0826cba865de48ff034387e124aec