Merge "Tuning system health diags" into ub-launcher3-qt-r1-dev
am: 1b0445dfa4

Change-Id: I4b6c3c04f1ce7c48d114457c986d115a38bcad94