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

Change-Id: Ia016fa4b5ea92ae9dcfe5e8b6a0fe4584effed17