Merge "Remove dead code" am: ce180df603
am: 025090c221

Change-Id: I112e9e12aea6850bdeadfeb1a6781ba40dece01b