am a0030efc: More Holo fixes

* commit 'a0030efc8d69f281189d9dcae4e235883002f8f7':
  More Holo fixes