Merge "Merge "API: Update ResourceBundle to OpenJDK8u60" am: 9d16a441a6 am: 29319829fb am: 49d903dac4" into nyc-mr1-dev-plus-aosp