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

Change-Id: I594fa793833a8df222bfe81aea5a35760e25bc99