Merge changes Iafdd91fa,I887a8f92

* changes:
  Update java.lang.Short to 11+28
  Update java.lang.Byte to 11+28