Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev