Merge "Merge "Remove line from bad resolution merge." into oc-dev-plus-aosp am: 3732ed29e3"