Merge b4fa49406fa1e36a3d4ce3daaf266d06cd7fccf5 on remote branch

Change-Id: I0ab67912c8d53db5f12f2be502bc8a60ae92eea5