Merge "Update AddressTest#testWriteToParcel" into gingerbread