Updated from global requirements

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