Integration for branch test_opensource

[git-p4: depot-paths = "//xFace-Apollo/branches/test_opensource/": change = 15996]