Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
am: 70f287362c
am: aa16276bbe
am: ac24351d2a
Change-Id: I0070b75ceade1d9607df4b051ffbca2bed756b73
This commit is contained in: