1155efdc71
* commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master