Merge "Add missing dep." am: 29a1d00035 am: 58af72a568 am: 9679aec289 am: a59455074e am: 20c2fb4357 am: 644bc66d28

Change-Id: I3c223382719d57c2d0a2f5463883e34055714cf2