* commit '39c0d4c031d479a679900cb540253f42747cb810': do not merge bug 3370834 Cherrypick from master CL 79327