Merge "Freeze kernel configs for r." am: 42debcc122

Change-Id: If92cef7fe769c954574c0088c47b1bcb65a58544