am e982185f: am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair

Merge commit 'e982185f3403c7ca693944ebc5529d53581acf75'

* commit 'e982185f3403c7ca693944ebc5529d53581acf75':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.