am e107c141: am 9d164dc5: am f4dffd8a: merge from open-source master