Updated from global requirements

Change-Id: I8459a46a64a616aa219515e777bc76578036b4dc
Merge "Updated from global requirements"