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

* commit '0861af4ab577d62896d74638549c3c944ab0a192':
  Merge 960ad4e0952da55943591098ea74827de921d303 from master_open.