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

Change-Id: I1130c11113c70ec4389b16bd6ab8bc81f15279b6