Updated from global requirements

Change-Id: I935592d6c597db402ab3ffa452b990adc87987ff