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

Change-Id: I6f42f03493a2f534a711b9a039ac22905188090c