Merge "Set apex_available property am: c83537b439 am: 4620879cc4 am: 1cb0494e7b" into rvc-qpr-dev-plus-aosp