am f059e531: am 250da641: Merge "Revert "Group revert of the following commits for design docs:"" into jb-dev

* commit 'f059e531506da8c053324caa3108a932d72da7b3':
  Revert "Group revert of the following commits for design docs:"