It was supposed to be removed in Stein, so should be fine to do now. Change-Id: I4996961b86be5ccc27b6c1066c1560564fe5cd41 Story: #2006963