Merge "Handling cases with a null bitmap." into oc-dev
am: 1eddb0cb2e

Change-Id: Iecc01386dc5a236a85d34ff0048ec2b6fd50bc6d