Merge "Allow version 52.0 class files" am: b5b10204a5 am: 1d29e2b7b4
am: 04249dd13d

Change-Id: I121fd7d6e330b913f170580ebe45482eac908297