Updated from global requirements

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