This reverts commit f178319b4a. Bug: 279251052 Change-Id: Ic67b94da213357af05a5c6e14e15946a02af7fba
f178319b4a