Updated from global requirements

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