DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master

Change-Id: Ibd3d0b9cd5f6cfac0cc7b89b5bc436d42b2006ed
39 files changed