Updated from global requirements

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