Merge "Update WiMAX assets to match new style Bug: 5724605" into ics-mr1