Updated from global requirements

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