Updated from global requirements

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