Revert "Revert "sync with floss""

This reverts commit 24dfa62a54bd52f7a99973ddef7187d39c6a3d9e.