Updated from global requirements

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