Merge "Fix npe due to strict mode in Bitmap.sameAs" into oc-dev
am: 8d2b02bf08

Change-Id: I88c7ffb54b3dfc12a24594c20a7b3787f81dc028