Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: a99009ccff am: 3fb9ac994d am: 315143478b am: b30052a072
Change-Id: Ic1bb6cc65cc396a02c7c1378182921cbe609c295
This commit is contained in: