am 55bef14f: am fb234bbe: merge from open-source master