Updated from global requirements

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