Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am: cf07154e71 am: 911dfe8861
am: 19937f924e  -s ours

* commit '19937f924e65d004855d26b4f6e356bc7a0168fa':
  DO NOT MERGE Remove more extras during notification lightening.