Updated from global requirements

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