Move SDK component to 2.4 - DO NOT MERGE.

Change-Id: Ibee46cfa081d81a7cc12f9b81ec0a3637f5b487f
2 files changed