pulling changes from aospa-legacy

Change-Id: Ib36ff9e64a5fe730950638f3822e2507c0a55500