Updated from global requirements

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