Merge "Create temp refs on proxies." into pi-dev
am: 6c14d4634f

Change-Id: I863feffc9894be5579258bcb232c29032f6cf2bb