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

Change-Id: Iae91c8af114ce16879eba11e07c4510bbb3ee094