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

Change-Id: I928541626c2230f15c4e696eb62a233796b99ce9