Merge "Merge 960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb