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

Change-Id: I65856b89d0be30fc3c3ae98dd91de96e4d005a4b