Syncing template-generated build artifacts am: 0d2f2c6686 am: 8c48226731
am: cc8bc8db65

Change-Id: I7b50a867a5c14da936012f833865553d7c91825d