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

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