Updated from global requirements

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