tree 4c0c5b7d2ae2f709ecaf0c363fb0c5adab4d832a
parent cb22da1e23ad5b1a666e73bbf234e6dc8b1b3d59
author Vyacheslav Egorov <vegorov@google.com> 1533035572 +0200
committer Alexander Thomas <athom@google.com> 1533041408 +0200

git cherry-pick 24158b773d29d36305ce6e8dbc1a1ce24a54e58e
git cherry-pick 68bfaf3ac349e78cf5a7ea78d48e0b51bae2e605
git cherry-pick 23ba527735b386371395cd06c4cf39381072fc89
git cherry-pick 72960de5f9a8bc36c7a6265d56c6643d93c512b5

Change-Id: Iaaafb084c940edbcc4c0383363f4365e5d904b64