Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev