Updated from global requirements

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