Merge "Do not CloseGuard KernelID or FieldID" am: 6b70eafae1 am: d25acf1022
am: 1b74e324f6

Change-Id: I1220dcc0ee27b8ba5650bf78cf9e8574b16e3486