Updated from global requirements

Change-Id: Iab7a038e5789ce2bc1947a8e93d2a4a243263616