Merge "Updating AIDL interface and removing unused methods" into tm-qpr-dev