Merge "Allow different explicit health and package expiry timeouts" into qt-dev
am: 0a94974b67

Change-Id: I16ebf4a0e917a2c66a6202a95ab875e38c3dda39