Merge "Fix test broken by PSS to RSS change."
am: c0dabf28ca

Change-Id: I0448f6455c48b166c59887716c5c1a11eff40692