Merge "Change the triggering criteria for blocking helper" into pi-dev am: 0712a8781b
am: a2b55eb813

Change-Id: Idf90cd57f31edcee9059543fa9bf5ce7826dfb8e