Merge "Set apex_available property" am: 330ef560a5 am: a5e6257edf

Change-Id: I4ad4a3ab1037e53f456fa0d2473130ced619a0ad