Merge "[automerger skipped] Merge "Return copies for get methods" am:...
Merge "[automerger skipped] Merge "Return copies for get methods" am: 0c9a514c am: 3411b38c -s ours
am: a36839b8 -s ours
am skip reason: change_id I51662a92b0b6189a8c8aa017085affedac417190 with SHA1 37538594 is in history
Change-Id: I2aeac163b9eed36b1fad5524b708c388cd2ec748