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

Change-Id: Idf8db002a4c902a0dcc74a6605dea8eba340f674