Updated from global requirements

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