DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours
am: 7e806813bb  -s ours

* commit '7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2