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

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