Merge changes I66723a00,I07f8182d

* changes:
  Enforce MEDIA_CONTENT_CONTROL in verifyPackageName
  Simplify if/else branch in MR2ServiceImpl