Merge "Add description of 'namespace' option."
am: 4588ed7b5f

Change-Id: I43d097498527f86c72fd3748afb0e31b53591501