Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev am: 3390511e17
am: 2ccb8c2fc1

Change-Id: I0afbc067084fb725d7093e017b8561b130d10f38