Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev am: eff156093c
am: a5c53a01ae

Change-Id: I9e172385ca47ee1a37986f27694b904acb22769b