Updated from global requirements

Change-Id: I884778c1168a8b4a3d307914faadebe8a2361e8e
Merge "Updated from global requirements" into stable/icehouse