Merge "Merge "Send transaction callbacks even when no BSL" into tm-dev am: f18ac6cac6 am: c7ebf7c488" into tm-d1-dev-plus-aosp