Merge "Update current SDK"
am: 9d4340a62f

Change-Id: I1716cefffa0e3f2b0516574802b5e21ef516de99