Updated from global requirements

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