Merge "Remove dead code."
am: cdd0aaa3ae

Change-Id: Iec8ef98b9f23f17c2ff016ea65583cbf2983d598