Updated from global requirements

Change-Id: Ib667b02069ba68b4e33eae844caae6d33ba368c3