Merge "Add Location Slice" into pi-dev
am: 53f6b7cb06

Change-Id: I0a18f0a70e9a653acf3fad8bf7c68763aa4d24a3