am 9791e6ea: am 7e58a5fa: Merge "Merge 960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb

* commit '9791e6ea170a6c6a2fc042a24d50af06c7238d83':
  Merge 960ad4e0952da55943591098ea74827de921d303 from master_open.