am e861b8f9: Merge "    Fix issue with authentication with flash" into eclair-mr2

Merge commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292' into eclair-mr2-plus-aosp

* commit 'e861b8f95dd52f89b7e7e34ba1bfc5b85c290292':
  Fix issue with authentication with flash