Merge "Fix PlatformCompatDashboardTest." into rvc-dev am: f1fe93bc2f
am: 14d7c1e369
am: e48064ea7f
am: e49067b8a1
Change-Id: I36817768acd64beb8383f004ee895eae0858be8e
This commit is contained in: