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

Change-Id: Ic3ff511cadec22ed9426548972515fbf02012793