pushing back changes in GCP-8241
Merge from branch_release_20140410