Merge "contexthub: Pass target API version in new fields" into oc-mr1-dev
am: 814b6922c5

Change-Id: Ie927e555a9a46474785d67122ad27f797f493da0