Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev