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

Change-Id: I72de5e2029c4f11313e21495b786697cab0a57dc