Updated from global requirements

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