Updated from global requirements

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