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

Change-Id: I1f5b291a0a0b4912df5996ff409eef8ec458d937