Merge "Remove dead code" am: 5c2d318236 am: 261a6788a3
am: 33ae1082f5

Change-Id: I0e5f2f92f10dff1b61c01440f38524c5e454745d