Update location tile(2/2)

Change-Id: I367ec9bdedbd576125228ca33a5eebd136433112
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0