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

Change-Id: If382471d541461a91ae516f4c84dbcfa87855344