Updated from global requirements

Change-Id: I9c5097a7cbb816eae7aac837fb2bbe6ddf72c56f