Merge 19b399a4f2e31570320fee0e68f869e959430cd3 on remote branch

Change-Id: Ida7b12197a7cb658d637b643cd84e2b48f33bbd8