Merge "Suppress deprecation warning for classes from jar files" am: 15887cc71b
am: d9d318f067

Change-Id: I4af9b5e9222209fdc979f13c2215af932fd1d620