am 7ed71b78: Merge "Reflect name change done in Phone package"

* commit '7ed71b7896c2572f8f876e100a0b8c1689632e2f':
  Reflect name change done in Phone package