Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: 04b6152ef0
am: 34190304f6
am: c40e8da0e8
am: 8f438d94c0
Change-Id: Ic90c4752299e4ab89decef656b1fbfe6711b7d4f
This commit is contained in: