am c5deca7c: Merge "Asset updates" into ics-mr1

* commit 'c5deca7c6a4139875e9b86c951f2b81b2db9f816':
  Asset updates