Updated from global requirements

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