Updated from global requirements

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