Use scopes for construction

Change-Id: I92ed65c2b47ad427a36cce7de7db82162f53f28c
Signed-off-by: Ed Tanous <edtanous@google.com>
2 files changed