Change-Id: Ia07630b2626781d89b1957a96706e22a9e28674f
This patch rearranges and reformats existing content. Change-Id: Ibcad865d2ae45696628f77b5bd5f0e6b1f6842cf