Merge "Add config flag for OEM to control PbA" into tm-dev