Merge "Fix missing title in broadcast" am: cdd531c962 am: 27cfc7b395
am: bb6133d55c

Change-Id: Ia354c5efa1f85df352691dc70cbf7e3df24c99bb