Updated from global requirements

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