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

Change-Id: I548d31e16df0a0ff3d68e8aed597356153ad575a