Updated from global requirements

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