am fcf249b5: (-s ours) Merge "Asset updates" into ics-mr0

* commit 'fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c':
  Asset updates