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

Change-Id: I089325b15a8c7c47823d95a1b74c735cb99ba55f