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

Change-Id: Ia81ca2acee65f589cf99952bd43aca6687468eb7