Merge "DO NOT MERGE Update JB MR1.1 Holo Test Assets" into jb-mr1.1-dev