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

Change-Id: I3f9e4cdf72eecb9c0d77e3d49c28b3256a6b3d8a