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

Change-Id: I4a3b6cfcd36132696a58bb5c1b331abdeb36224d