Updated from global requirements

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