am 51110d63: am d08fbca4: am f6163908: Merge "Some Holo Test Improvements" into jb-mr1-dev

# Via Android Git Automerger (2) and others
* commit '51110d63ac9e8d09521b186e7f897f30826dc7b2':
  Some Holo Test Improvements