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

Change-Id: Iece7adc8dd9a3cb5c704e917b22337cf8339f460