Fix up architecture section

Change-Id: I62cb96113032d8c86ff2ebcf94a7e9956049991a
Merge "Fix up architecture section"