Add extras required for compilation

-> Patching back from a future branch

Change-Id: I5127a82560e39bf391fe083d0eb8932cf2473562
1 file changed