Merge "Remove unused methods." am: d96e802dae
am: 09cccda109

Change-Id: I1690897c30dd4f88186000c04df0d16cdd42a601