Updated.

Summary:

Test Plan:

Reviewers:

CC:
Generalize Top/Inner layers.

Summary:

Test Plan:

Reviewers:

CC: