Merge "Replace ASM 6.0_BETA with final release" am: 893bb44728 am: d533ed7631 am: 8f8c2ddbf1
am: 04cc1ce6a3

Change-Id: I8897ee06fadca4967d3554e02d20a3eda6221228