Merge "Fix DevelopmentSettingsDashboardFragmentTest" into rvc-dev am: 40613ef30c
am: 3cce160521
am: 65621e32a2
Change-Id: I5901de77bbc04c876ea6aff2226635923eb2c780
This commit is contained in: