Updated from global requirements

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