Updated from global requirements

Change-Id: I9648286d526f4d0d54e6d15e9ed9a0cf36c1f173