Merge "Replace ASM 6.0_BETA with final release"
am: 893bb44728

Change-Id: I95f70f8aeb02a491b328c2aeded8809011ade285