Merge "Stop user faster and clear stale broadcasts" into nyc-dev am: ec6faca007 am: 8dc73a6bc6
am: d229a3fdfd

* commit 'd229a3fdfdb3f028b3a39cfaee785b39b2729541':
  Stop user faster and clear stale broadcasts

Change-Id: I5b69b7432f7cedd92f6891734643809e0170b3cc