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