Updated from global requirements

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