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

Change-Id: I3dceee794572d94af13226f6af0eab0e465d6be8