Updated from global requirements

Change-Id: I164fbd93140a0048c8173ae4187b9e8b882bdebb
Merge "Updated from global requirements" into stable/juno