Updated from global requirements

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