Updated from global requirements

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