Updated from global requirements

Change-Id: I32c8167913b9412120d1256ffddf9117f765551f
Merge "Updated from global requirements" into proposed/juno