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

Change-Id: I3d566406a402d288694c79b4390bd456c9dc6917