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

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

Change-Id: I7391006c948be8188b8b197c1e318b76a826155a