merge AOSPA-legacy

Change-Id: I46058b3ee7171e6f63ca273162ac6107ca8d40e0