Merge "DeviceStateMonitor and unit test polish" am: 68c66ceb7f

Change-Id: I4775e8d10bf8e1d259ecc50780d2abc1779ef109