Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: c6fe4407fe
am: c50085fed5
am: 573cd1d0aa
Change-Id: Icb28283ac1cfbc4578e66760498d2bcffd7318e7
This commit is contained in: