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

Change-Id: I31f49b5eadf3f1aaf088978553aeb3d497b5d77b