Synced from global-requirements

Change-Id: I98ce49fa49343dfb93459ca0cd5dc5f658fba2d1
Merge "Synced from global-requirements"