Updated from global requirements

Change-Id: I7a933f1ab110f62a7c32862da61a83ec0521d147