Updated from global requirements

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