Updated from global requirements

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