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

# Via Android (Google) Code Review (1) and others
* commit 'd08fbca4b676635ada38d573b011f08cb3a0ec75':
  Some Holo Test Improvements