bringing in code from g3 and updating some name spaces to match

Change-Id: I0baf0d77ba2ec076e2e16849b11944907416066b
48 files changed