Merge a85a83d121d8ac901d9e2ab5f1c61b176f3f42b2 on remote branch

Change-Id: I560fd79ef148a695d5261d331047c80f3dcf37c9