Updated from global requirements

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