Before UI Component Hierarchy Refactoring
Change-Id: I89345d76c5bf52f5f9df8e1ac112ee7ae2d4d929