Updated from global requirements

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