Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am: b7febbb727
am: 11ba1cb60a

Change-Id: Iebb4844baf119ae51749aab524184f35c208853d