DO NOT MERGE ANYWERE. Update sdk to #2421165

Change-Id: Idb1511ee00eb7eb578df5046f6b2d10d7f8e7bd2
2 files changed