Merge "Return nullptr from FindNamespaceByClassLoader for NB-enabled apps." am: c54c533cf6
am: b870bbd69a

Change-Id: I15d9d46071941e871e332ae5ab83fc4a3b73042c