Updated from global requirements

Change-Id: Ic0d8ce65791def4f03e421ad7e1aabe47d7335a2