Merge "Add permission and permission.xsd" am: e5d100518d
am: 27ea7c09d3

Change-Id: I69ec0c2f8cfde85d3684f18558dfb5e4ca5b8137