Merge "Remove references to kernel macros." am: 0e82c84aba
am: 1016972e58

Change-Id: I1ad17e947ebb3457e3fb708f9c35cdee0afd3452