Merge "Removed screen on/off callbacks from NPMS." into nyc-mr1-dev am: ffd0d578d1 am: 00cd5cc241
am: 5105221b41

Change-Id: I6c60aee64ff9fb63db3ef9601313d01b34f3766d