am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev

* commit 'a6131422fd68ccfced1a055c8e1d84e3cb500710':
  Update platform SDK component to revision 2. [DO NOT MERGE]