Backport service monitor fixes to 1.30

Change-Id: I34cf0ea286b05b887025a9ca9d33e361c5989100
Merge "Backport service monitor fixes to 1.30" into R1.30