Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d
am: 540ebc39ac  -s ours

Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142