Merge "Fix PDK build" am: 6fb05cb71a am: 45fb0abd34
am: cf2a44ca86

Change-Id: I36e26167cecd8df08e5ae435700c2f38323b0237