Merge "Improving system health diags" into ub-launcher3-qt-qpr1-dev
am: c86a6ebbc5

Change-Id: I79a0dbe3012f2d9cdf39851420b8f45da712af40