Merge 35765066 from ics-mr1-plus-aosp

Change-Id: Ibaeb49dc20f3c736417d5cb68769e7b501a61632