This reverts commit be3ea4f149. Reason for revert: Reland Change-Id: Ic003c52a1477da9a6a70b82e4d4ae4a55edc584f
be3ea4f149