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