Merge "Fix taking actions without considering pending health checks" into qt-dev
am: 9192a430af

Change-Id: I069620eb5f96c8d63ade4cffc945612607282173