cherry pick fixups

Change-Id: I3b3b71945eefdcc77fd69444b425f340bc90d020
cherry-pcik fixes

Change-Id: I04a559526850487a7a4e7018818351cce66ce1c7