Merge "Do not reload bitmap unless necessary" into oc-dr1-dev
am: c4c5d60607

Change-Id: I8985bfe8ed4a0067877ed042e256ecfa67ed5682