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

Change-Id: Ied7c0fc15d37b6056b1db97806766c6ef604e245