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

Change-Id: Ife8877d1f250327533efa38dd44537f0ea2f530b