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

Change-Id: I5b74950db268d8bca22139d4cab5d674ecd030ee