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

Change-Id: I9c2a952c5ae1a7b03b4bd0ab9accd265e9ccee93