am c9506415: Group revert of the following commits for design docs:

* commit 'c9506415d533c61a9607c5b61a1993747bafb406':
  Group revert of the following commits for design docs: