Updated from global requirements

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