merge AOSPA-legacy changes

Change-Id: I19253635de0a86673efc120b43b5951a0c6d32f1