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

Change-Id: Ic9a99ccbec6895ce540776577e3c5613b31981ca