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

Change-Id: I8d60424a107a3c27d69007ef116e3c3799fd54db