am 675f39d6: Merge "Update ContactCommon to handle new ui changes for People App." into klp-dev

* commit '675f39d654c1b905a26299baf8594d4c12177b88':
  Update ContactCommon to handle new ui changes for People App.