Merge "Change flag from -includekeyvalue to -keyvalue/-nokeyvalue" into oc-dev
am: 3cc32f2aa2

Change-Id: I3b59aa367d946d6cad363e480c5c1d08e2d0282f