Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f
am: 14d7c1e369
am: 16fcf16c45
Change-Id: Ic68676eae2d494822791cc56911230447009cdb7
This commit is contained in: