am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1

* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
tree: e4310ca29bae77b80024568770cb95935a3a036b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/