am 3ec232f5: Merge "Update assets." into ics-mr0

* commit '3ec232f54f93ace9e425d87e2d6adfcb765543ef':
  Update assets.