Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2 * commit '7f8e34091efdee1a383280b08585f8254472c1fd': Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.