Merge "Add new apexd.status value of "activated"."