Redraw ref-arch schemes

Change-Id: I479480fc38e78c674e176915bc6f0b06eded532d
Closes-Bug: 1259424
Merge "Redraw ref-arch schemes"