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

Change-Id: I4b656b9aa3c8658a097a567748a42fc7c67dab20