Updated from global requirements

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