Fixes for GlobalCssJs

Change-Id: I8488f59fcf39bc2546a363ab1f9bc6b791e6ee8a
Merge "Fixes for GlobalCssJs"