Updated from global requirements

Change-Id: I027659520dad2166b8e28ec0a2334cd58c563dfc