Merge "Add description of 'namespace' option." am: 4588ed7b5f am: 52807711fe am: ce44aa8487
am: 6ccc8323b2

Change-Id: Idf1a83dcff90425d20c4f1dd1a7dff10795bce42