Updated from global requirements

Change-Id: Ia256b2210e8aecda0d9bbc10e563e06a68a2e44b