am 1aaad610: Merge "Do not hold a lock when calling API to grant default permissions" into mnc-dev

* commit '1aaad610dfc7445ec29fd906974677515c3a9f87':
  Do not hold a lock when calling API to grant default permissions