This reverts commit 94b8055f1c. Reason for revert: Revert this cl and fix broken test cases. Change-Id: I61a190b4beba8db2fe2faab45e5dd6921dc681ec Fix: 149112222 Fix: 149090275 Test: Run all Setting robo tests
94b8055f1c