am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread

Merge commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4'

* commit 'cb51c0c7b155a5141a51fc4d3e57792da7e89cc4':
  Remove old location classes.