Updated from global requirements

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