Merge "OMS: fix typos in permission check message" am: 57e5e68385
am: ffb4fe7199

Change-Id: I95cbf838a85fb41c886570b9afe8f16947d49b43