am 4881d024: Merge "Update ADT with ASM 5.0.3" into studio-1.1-dev automerge: 540d62bd automerge: 9848807e * commit '4881d024': Update ADT with ASM 5.0.3