Merge "Apex_available check failure reveals dependency" into rvc-dev am: 5a3899b5 am: 0c9541f6 am: ca148204 Change-Id: I9ac961d4c3f59704339f618d8f7312f078171dab