Corrections to architecture doc

Change-Id: I3b3a43ece073e9a7bacd981abe80bdd233236b4a
Merge "Corrections to architecture doc"