Merge "Update namespace to match framework/ml/nn" into pi-dev