Merge "Workaround for "required" dependencies not being followed in APEXes." am: 71faa00a am: 3068fb60 am: 1a0a8f96 Change-Id: Idbe2a02a3d4bfbf4dec1680daf5ac6815eab66ec