Merge "Remove unused development setting" into rvc-dev am: 74b8acae26 am: 388016ae0e am: ff9b27c558 am: 9fee96e3d2

Change-Id: I773b1e45958590bc69f38091f7f289a5dcfeea35