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

Change-Id: I699721fe8c1354d4a1f6adf70ccced59175aadd4