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

Change-Id: Ic0748c75374e236cce9a7d218d38b97397722696