Modify Location Tile [2/2]

Change-Id: I06b3bf6c2bacc517e9dafb67ce39dac7259623cc
Merge "Modify Location Tile [2/2]" into du44