Remove unnecessary code.
am: 3071308b88

Change-Id: I13f0c9675eab88a953edc3f209be1c499ebcb937