Merge "[KA09] add keepalive offload permission to shell" am: bc350db984
am: b15da9fb19

Change-Id: Ieab8acf24f294d758667230b5c07a6540419186d