Merge "Adds AID_CONTEXT_HUB" am: 19e4f2b5f3 am: becd114785

Change-Id: Id9a4eff811f6ff331ec0262824320b16f8fdbb38