Updated from global requirements

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