Updated from global requirements

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