Merge 2f4ca3925324b6496698116e09898ae89442eac3 on remote branch

Change-Id: Ida2d0853376bb1dba42d5b5fe37faae85b20af80