DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d -s ours...

DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d  -s ours am: d28e7ea3  -s ours am: e038da17  -s ours am: e3b631a5  -s ours am: 7e806813  -s ours am: e20dd6dc  -s ours am: 63847c39  -s ours am: 53380a83  -s ours
am: 57ddb787  -s ours

* commit '57ddb787':

Change-Id: Ibc698fe630c5512954a740c53ee26d45edbe183e