Merge "Recreate the bitmap cache when it is smaller than needed" into nyc-mr2-dev am: 987f4e53e4
am: c76ec25ac4

Change-Id: Ia660c4c9da7b128091a6bb6aeb145d67ba9be117