Merge "Update enrollment with API update" into rvc-dev am: be753c3543
am: 139caf98f3
am: f5d19cb558
Change-Id: I0822157f2e2b8d3a3c178c4517a56c4410c68fb7
This commit is contained in: