Change-Id: Icb3d101f15f28ab5e0e17eb4357889be598acea1
This patch rearranges and reformats existing content. Change-Id: I8cac6f099a29c27cea7847547307c039c44f6633