Merge "Add missing transitive dependencies" into oc-dev
am: 3fa195c3cf

Change-Id: Ie1a88f1fa5fc857dbebc739b0a6f0a9de6e351eb