Updated from global requirements

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