This reverts commit 59354f550b. Reason for revert: disable first Change-Id: I3d74311bc66476e259018a1bc62cf0433ba5c165
59354f550b