am ae429828: Cherry-picked from c4f37eed7 in master. Do not merge.

* commit 'ae4298286896cbef22b2af285a3f651e8f498185':
  Cherry-picked from c4f37eed7 in master. Do not merge.