Merge \"Settings: add logpersist kernel only selection\"
am: 3c60540078

Change-Id: Ieefd7e08368174f735b8491f8f01847906e1fd3b