Merge "Holo assets for TVDPI" into jb-mr1-dev