This reverts commit 55082ca17e. Bug: 279251052 Change-Id: Ic67b94da213357af05a5c6e14e15946a02af7fba
55082ca17e