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

Change-Id: Ifffabe5ed1fc3698a3f6787e7e58fb7f96b79c24