Merge "Support apps attribute in apex_defaults" am: 1d1a920794 am: dc1c78fcd1

Change-Id: I2ae2f868effd2997b2eea6cf8b301e2e04e446d9