Merge changes Ifeec9a72,I2cb6eded into rvc-dev

* changes:
  Insert media for PermissionActivityTest to use.
  Increase strictness for all apps.