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

Change-Id: Ie9c5333086b607f14238235cfe5996254e09d767