Updated from global requirements

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