This reverts commit ae03031efe. Reason for revert: Merge the reverted patch by accident. Bug: 162627132 Change-Id: Ic2f072730050cb47926cec6ed24af7ef9e5e7055
ae03031efe