Updated from global requirements

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