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

* commit '7e58a5fa66f905a4524267cd1a9328d8046b3280':
  Merge 960ad4e0952da55943591098ea74827de921d303 from master_open.