Updated from global requirements

Change-Id: Ie9c63f3f8ace2bf0c0da1e7b72d0b4921f93c18d
Merge "Updated from global requirements"