Merge "Add missing transitive dependencies" am: 810544541d
am: 6e49f97ae8

Change-Id: I7dd88770a9d19c77a0c7808c62a087c03071ccba