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

Change-Id: I766145814ad84298ee5b785d17dd7059f6dcc56e