Merge branch 'stable-3.6' * stable-3.6: Missing dependencies in stable 3.6 Change-Id: Ifd4e02386e5502068ab6ea3379dda9ff5f830260