resolve merge conflicts of c45b2cc525 to lmp-mr1-app-dev. am: 610cf316a8 am: 542b135203  -s ours am: a40e99046b am: 6eb7c74188
am: ba85a48271

* commit 'ba85a48271c8a5fd6d43653dffe153a40a100125':
  flo: update prebuilt kernel [DO NOT MERGE]