Merge 05542d96015c88e6bcb9339b46f25c10c5073214 on remote branch

Change-Id: I517eae8a630bd5d610457f11a92e376a0281436a