Reconcile devicestoragemonitorservice with cm

Change-Id: Ib7149a404faf0980a256b00b420d29bdb5ac3fea