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

Change-Id: Ia015ef24d9e2d4ab3f1cb986a1bf68dbb6df3c7d