Merge "Revert "Updated Holo Test Assets"" into ics-mr1