Merge "Some Holo Test Improvements" into jb-mr1-dev