Merge "Add more owners to apn file"
am: fdadf03033

Change-Id: I7c258df6f47ebf1a6bac6d0fabc44231224761a6