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

Change-Id: I21768bca6ac9132292b714d9955fb59502d010a6