Updated from global requirements

Change-Id: Id2bf612aeb54ec39a8269dda036673e7935ee9ad