Merge "do not merge bug 3370834 Cherrypick from master CL 79417" into gingerbread