Updated from global requirements

Change-Id: I7625287ca336937fb447b41e9f74e6cf1e3df034