more fixes for aosp

Change-Id: I26d9054395af6bbad2b3288c6d4c72421202cfce