Merge "Don't create StateTrackers for whitelisted atoms" into rvc-dev am: c20fcfeeff

Change-Id: If2c71c073688653571abe2db05009e76e4943f99