Merge "Workaround for "required" dependencies not being followed in APEXes." am: 71faa00a31 am: 3068fb6006
am: 1a0a8f9673

Change-Id: Idbe2a02a3d4bfbf4dec1680daf5ac6815eab66ec