Merge "[automerger skipped] Delete unused getNamespace method am: 67b4512b07 am: 5e5a2aff8d am: 46e9fd117b -s ours" into rvc-qpr-dev-plus-aosp