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

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

Change-Id: I7f17e328de62c50087bc6d2acf3d8c17f5fb541f