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