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

Change-Id: I713f90cc88a3c335fd8ec8c391f40465c48a519f