Syncing template-generated build artifacts
am: 0d2f2c6686

Change-Id: Id1a57c165b017cc460755a90be859d39cd1053b6