Merge "Return copies for get methods"
am: 0c9a514c20

Change-Id: Ic082bc01fc23b902b6412f6e242759c25662146a