Merge "Modem power monitor" am: 366318b9c3
am: e66ad835f2

Change-Id: I8753ea8b944c7dfea1fa049f67350a1ce85fd9f7