Merge "[Title] Fix build error." into 2.0_beta