Merge "Make QS light" into oc-dev am: 755138bb1c
am: 5881209cac

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91