LocProxyBase patch

Change-Id: I532fa651c1c36c0e77f608e2d4cb1765c60fb342
fix derp

Change-Id: I07b205185f5155d6fe000c105e5356cf68bc1204