Fix build

Change-Id: I5036b6530954897c8c03da90765efda4118b041b
Merge remote-tracking branch 'pa/jellybean' into fjpa