am ea6a3c70: Merge "Minor updates." into honeycomb

* commit 'ea6a3c706ada7db1abeda609aa5d1ba9209c7f2b':
  Minor updates.