Updated from global requirements

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