Merge "Fixed serialization of Java library models." into studio-1.2-release