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

Change-Id: I1ef3e3a515b6a12b96ca5cdee799a346a87b244f