Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev am: 0418406186
am: ae8784bbc8

* commit 'ae8784bbc893541182335c9de7da90c25d505dc7':
  Add Oem Props to otatools package

Change-Id: I7299e85b544338a0ff455b5f700d57048816e3ff