This reverts commit fcef23e831. Bug: 28028331 Change-Id: I0bbcf7024749d06b7d78574afbb9625e6de8b96d
fcef23e831