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

Change-Id: I45037ff79d7ad71f3ee988a3eafc780e62c2f1f0