[automerger skipped] Merge "fix the class not found crash" am: 610e99f6 am:...
[automerger skipped] Merge "fix the class not found crash" am: 610e99f6 am: 10b17595 am: e9ebebdd -s ours
am skip reason: Change-Id I24d8ca22f9b1ee43dd1565bb37eef41b4acc23e2 with SHA-1 c134c7f0 is in history
Change-Id: Ida2ee07eb19d2e57cf29b09d454a77239a3dd7af