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

Change-Id: I06033eebc52577fee38aca715a337b6c75580a08