mods for aosp+

Change-Id: I46f94fc8d7cd91a5cc089317c415223bbf99eb26