Merge \"Settings: add logpersist selection (strings)\"
am: 99afd4a87d

Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba