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

Change-Id: I20e1ece0bff0952f52329f7844d87f038420f43b