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

Change-Id: I8c64ffef57ce59e75c73b234f76ea3b777c5621a