Merge "Merge "Stop user faster and clear stale broadcasts" into nyc-dev am:...
Merge "Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca0 am: 9dee0bcc" into nyc-mr1-dev-plus-aosp
am: 0684bf71
* commit '0684bf71':
Change-Id: Ibd4f0ae3b3197af2e177394f011c8ee7b15c0e0b