Merge "Remove old unused transaction codes." into stage-aosp-master