Updated from global requirements

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