Updated from global requirements

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