Merge "Cleanup (remove ldap, reduce screenshot log level)" into rvc-dev am: 59fcab207e

Change-Id: I3fd6eff63baa787741e25296fe43fa86c06c96dd