Merge "DO NOT MERGE Remove more extras during notification lightening." into...
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am: cf07154e
am: 911dfe88
* commit '911dfe88':
DO NOT MERGE Remove more extras during notification lightening.