Change-Id: I5fff488ab96f1e28942143330c69370f2009e691
This is a pure namespace refactoring change. Change-Id: I33f5998f876cdc9893d8d45983422ca0e331b3c4