[automerger skipped] Merge "Fix PlatformCompatDashboardTest." am: 805f137935
am: 976f7bfe78
-s ours am: 5208d31a72
-s ours
am skip reason: Change-Id I833669f7f2a5128bdeda7451b8ff6e0bb753c500 with SHA-1 76f93fe912
is in history
Change-Id: I238f8d69b70d3d452900cb4c98d80778a87ae406
This commit is contained in: