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

Change-Id: I54d13f204587340eac67775212811f4b4b344c43