Updated from global requirements

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