am bf60a224: am 025de556: am ddf25bba: Merge "Updated Holo test assets for JB MR1" into jb-mr1-dev

# Via Android Git Automerger (2) and others
* commit 'bf60a22446a60ade740d36a89c5f7c3120a1fd06':
  Updated Holo test assets for JB MR1