Merge "Add checks for detailed uid stats"
am: 8d9b120318

Change-Id: I530d78765b24edcb3260ed4647eb785c089aa2ed