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 am: e20dd6dca2  -s ours am: 63847c39a6  -s ours
am: 53380a8386  -s ours

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

Change-Id: Ib9bf2caab8b3db344b3de9ab8b5daaf0f14f8397