am 750ac4f3: Manual merge of change 50994 from master (DO NOT MERGE)

Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp

* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
  Manual merge of change 50994 from master (DO NOT MERGE)