Updated from global requirements

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