Merge "Add a helper to get ECC info for current location" am: 859bb7355d
am: 1b7aeab030

Change-Id: Iea3d34ed07b33d0602bf892864338d8623e8dafa