Merge "Delete dead code." am: cf59ff79c5 am: d305a7c894 am: 8cf7169564
am: bb79257dbf

Change-Id: I97102d587cfc8699fd36f18e4072a5baaa7e2d11