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

# Via Android (Google) Code Review (1) and Brian Muramatsu (1)
* commit 'f6163908c038f6fec9301bfb80ca08ecdff3a5ff':
  Some Holo Test Improvements