Merge "Remove references to kernel macros." am: b25a7319d5
am: 2635f7e727

Change-Id: I41ed9061ef80b2ad4742e43a40dfd50352b21c92