i605: update for AOSPA

Change-Id: I7c232a7b870ffe92c72bcb931ca7d8e876482521