Merge "Remove unused development setting" into rvc-dev am: 74b8acae26 am: 2d19e31977

Change-Id: Ic801fa5b706996d9d79dc9d24e6bfaf309a0675e