Merge "Add comment to android_link_namespaces method" am: 7e7913cb67
am: 70cfd3ae79

Change-Id: Ic2dc339da35e52af410cf8a056bad2f75733a258