Merge changes from topic \'enable_persist_kernel_log\' into nyc-mr1-dev
am: 1a48150980

Change-Id: I1e9eb21d5df60caf717e056bb571e93add127075