Merge "Fix strings in PlatformCompatDashboard" am: a9f0446ce8 am: e89b34a366

Change-Id: I9ac23dd4d5bce7da2841e529ea7be65260ce987c