am af831a7b: Merge "fix [4107131] nvidia driver call takes a very long time" into honeycomb-mr1

* commit 'af831a7bd5f1a3ffd1129f5f15b862c5973d48b6':
  fix [4107131] nvidia driver call takes a very long time