Merge "lazy load enrollment application UID in VIMS" into rvc-dev am: fa47464c2b

Change-Id: I8674e55865675697183103d59b9d00c9fdef0044