am 7b4ea38b: (-s ours) am ecc4e8d5: (-s ours) Merge "DO NOT MERGE. Updating SDK prebuilt to 1681722." into lmp-mr1-ub-dev

* commit '7b4ea38b6cb9ee19deea3b1e7e2b669bd193f6f1':
  DO NOT MERGE. Updating SDK prebuilt to 1681722.