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

* commit '6187c1dabe142e9644706dfd5962e1db6376eb8f':
  Add Oem Props to otatools package

Change-Id: I56a7440bb7cb189b7bd25223165d083a12bdb195