am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
automerge: dfb99e8

* commit 'dfb99e82740fe21006bb6972af6af610ed12edbe':
  Update javadoc and hide getNameSource and getDataRoaming.