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

Change-Id: I1e126e4e3b8ce7725ed33113bf81335763a7e6e9