Merge "Address API review comments for registerReceiver" into oc-dev am: 1f4e053aef
am: 46f7f1c245

Change-Id: If4167d8458b144a73deeaceeaa51b1f8d482d6d7