Updated from global requirements

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