Proxy loading from the merge tool

Bug: 532484
Change-Id: I7f2e34db492c82a01d6cd42a2c0800e7a3f75455
1 file changed