Merge "Add rules to handle asset resources." am: 387ad5c576

Change-Id: Iae9ef6b005b3d36fe24a805233ae9d1eeb2ad70b