Merge "Merge "Update Bitmap#prepareToDraw doc" into oc-dev am: d4fff1565b am: 27caadd2c4"