am 0f57228b: am 43abe820: merge from open-source master