Updated from global requirements

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