Merge "Merge "Allow system apps to define ephemeral permissions" into oc-dev am: 0ddca920 am: 987da51b"