Merge "Injecting data stall event to statsd" am: 2fd3ca6fa0 am: 853d1ae5ac
am: 29f2aff772

Change-Id: I9d3395e7bddd8b8bdb528454a4b3c6636141d58e