Merge "Preserve failure history when calling startObservingHealth" into rvc-dev am: da41b0a2 am: 332f4d5b am: 6e83e34b Change-Id: Ief5c784ad993a5d4171256eadb7ce951067635de