Merge \"Fix issue #29438842: Enter the \"am broadcast -a...\" into nyc-dev
am: d2480ab7bb

Change-Id: I57f8a28b73cb91f6602f7ac9dce67bdb5ea545aa