Updated from global requirements

Change-Id: Ica7572524227411f0d496d9b74d39396634e9200