am 17b7ff4a: am b25a6936: am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."

* commit '17b7ff4af762cd5e9921e9ee360e139956f220a5':
  Add hidden minor version ID for support lib workarounds.