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

Change-Id: Ie06b4dc41a8b0bd9d52c0c7917dae822c79bb0ee