Updated from global requirements

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