am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2

* commit '70921d615496c5be8a19cbd1454378bb7d0201f3':
  We must keep up with the Joneses.