Merge "Fix misc-macro-parentheses warnings in context-hub.h." am: 81a5640cf9 am: 9d2f461264
am: ff72d357d4

Change-Id: I935e32cd73ae3d29d6886dc4701f02db52bc7987