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: 7a21c752
* commit '7a21c752':
Change-Id: I9a304eda38e348109f0b251ff5148f3630341abe