am 26cb0bc5: (-s ours) Merge "DO NOT MERGE Bump the version number to match the platform." into lmp-sprout-dev

* commit '26cb0bc5b3a5586bb47bee1fe4cf45360a062f7d':
  DO NOT MERGE Bump the version number to match the platform.