Updated from global requirements

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