Merge "Add missing dep." am: 29a1d00035 am: 58af72a568 am: 9679aec289 am: a59455074e

Change-Id: If47e884bd4ae76f5111cf4582098fa8cbbe5160e