Implemented changes to CSS injection based on API review #5500

Change-Id: I2bed5f5a5c3cfc6b97e94cbd218bb06f446c7325