Merge "Remove unused method" into rvc-dev am: 85aff0a391 am: bc5d0878cf

Change-Id: Ic56dc417aa7c369a647471722660bca66018bf5a