Merge "Use apex_available property" am: daa7cd7bcb am: fa4892ebc8 am: c4b0d5782b

Change-Id: I719c8d0a1d3fb1a24f49ac70cc2e4c54ef31a524