Gennadiy Civil <misterg@google.com> committed R9484:f5260ae757a6: Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into… (authored by Matthieu).