am ae03b007: am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit 'ae03b0076973d5ece5fd300748c29098955afec7':
  Ensure deterministic multidex partitioning