This reverts commit 461a34b466. Change-Id: Iac4ca77eeaa94989e91dead49a7959c905bd3078
461a34b466
b/23110861 Change-Id: I9aa980d7569247d6b2ca78f5dcb4502e1eaadb8a