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

* commit '4a39ecb7ac71e58d0a221d315f7f9d33ce6bfc2b':
  Update content description after updating primary

Change-Id: I208fd73b25007cafa355a2307d4627846e29f074