Make field 'Namespaces' optional

Closes-bug: #1322737

Change-Id: I8f67fd7cfb78483a2424776c5c9472ad732ada47
Merge "Make field 'Namespaces' optional"