Merge "Register broadcast receiver at runtime instead" into pi-dev
am: 806be6b602

Change-Id: I3375ae095ef08830ea1892c3652832d17308340d