Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev am: 0418406186 am: 6187c1dabe
am: 5349e26a0e

* commit '5349e26a0e361cc32117bd755c67d73bf17ee992':
  Add Oem Props to otatools package

Change-Id: I653161059a7890b03125be6baafe309d6748315b