Merge "Change the data structure of restrictions in UM" into rvc-dev am:...
Merge "Change the data structure of restrictions in UM" into rvc-dev am: c444d10c am: 4561c7d2 am: 012bc12c am: 414c66de am: ea005557
Change-Id: I20512092aacf444947734a52c2881972cc8f4b9a