Merge "Minor updates." into honeycomb