Updated from global requirements

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