Merge "Don't update the genID for an immutable bitmap" into rvc-dev am: 10dd5e9a18 am: e9f550649f

Change-Id: I48ac142c34c48ac2e573e8ff6164862ecb9f0d71