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

Change-Id: Ie684605c998940f3448099608a09ed56df0d4686