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