Updated from global requirements

Change-Id: Icabc07996dfa7bb9cae2a5fab2bd7732fa85c402