sdk 2.0 fixup

Change-Id: I1f7b376464a8d73601e8e58e3d73eb1441fbe023