Merge "[automerger skipped] Merge "SpatializerHelper: fix canBeSpatializedOnDevice NPE" into tm-qpr-dev am: e455bc8e am: 9b235a80 -s ours" into udc-dev