Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into tm-qpr-dev-plus-aosp
* changes:
[automerge] [RESTRICT AUTOMERGE] Null is a valid volume uuid. 2p: 3fae7a0c
[automerge] [RESTRICT AUTOMERGE] Add a debug workaround for the tests. 2p: 3f60b9a1
[RESTRICT AUTOMERGE] Null is a valid volume uuid.
[RESTRICT AUTOMERGE] Add a debug workaround for the tests.