Merge changes from topic \\'enable_persist_kernel_log\\' into nyc-mr1-dev am: 56efe020b7
am: 784b39483f

Change-Id: I6a2a40e2850ae08c24acf32b4f3583eafcf5581d