am c353fa53: (-s ours) am 1f639980: (-s ours) DO NOT MERGE ANYWHERE Update support library from lmp-mr1-ub-dev build 1820435.

* commit 'c353fa53daa448fd193e4958e227f89a36eca893':
  DO NOT MERGE ANYWHERE Update support library from lmp-mr1-ub-dev build 1820435.