am 5b543775: Merge "update preloaded-classes"

* commit '5b5437752fb2318142a41b6320b00a000575503f':
  update preloaded-classes