Merge "Always report non-null TetherStatesParcel"