Merge "Split TestApexAvailable into separate tests" am: 33050c13 am: 20dbaf93 am: 20f73b22 am: db61da0c Change-Id: I9b17617d08aa48b27cb29ac608f27d20852bdec5