Merge \"Settings: add logpersist kernel only selection (strings)\"
am: fd021e203d  -s ours

Change-Id: I3eebcf646fa289462caf57b51846cee93a7774c0