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

Change-Id: I6e770ca175fa6c4741d2d587e34086f2c084713c