Updated from global requirements

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