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