Remove unused feature Bug: 146316349 Bug: 146029035 Change-Id: I702a3b2abcf251666304fc575ceff2316d8b6ec0 Merged-In: I702a3b2abcf251666304fc575ceff2316d8b6ec0