Updated from global requirements

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