Bug 896942 - Fix assets
Merge pull request #11137 from crh0716/896942

Bug 896942 - Fix assets. r=schung