Merge "Fix PDK build" am: 24e34e4b8e
am: 9a393de28f

Change-Id: Ifbca60968122be56fc1aa4567354f26e5a41d848