Updated from global requirements

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