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

Change-Id: I8136f00004bc390bd6ec39279da0ec987e946788