Update namespace refs

Change-Id: I16e970698cbd6c16b633b1dbc8f143bc7acfe494
Merge "Update namespace refs"