Merge "Update content description after updating primary" into nyc-dev am: 4a39ecb
am: 955b059

* commit '955b059b23f8dbd57c69b02b633328ff822e9d75':
  Update content description after updating primary

Change-Id: Id45f3d5365ee0597348eac58097397dc6284af5f