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

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