Updated from global requirements

Change-Id: I4fbb6e8113bfc52403caba985c65212577cb4633
Merge "Updated from global requirements" into stable/havana