Updated from global requirements

Change-Id: I9be144089b97a17567faf300d0a7e2f179d9bf31