Remove redundant code am: 4ebc5986a8
am: 82907dfd36

Change-Id: Ia55faf872466f837ea1b7c327ffc30590d781d60