Updated from global requirements

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