Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: a99009ccff am: d9d679182d am: 5dd44a8907
Change-Id: Ibc1d8e48b4252c6dfde083308de462beb0be8dba
This commit is contained in: