Merge "Test: parcel marshalling for user credentials page"