Merge "Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007 am: 9dee0bccd8" into nyc-mr1-dev-plus-aosp
am: 01c037a234
* commit '01c037a234b01c836f1381c97ac681bb680659e7':
Change-Id: I9a304eda38e348109f0b251ff5148f3630341abe
This commit is contained in: