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

Change-Id: I9c815d76916b4516022b09c31e9afcd11a107e26