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

Change-Id: I2e55e686914c7d57b6ab96ba5931935aa62c7deb