Updated from global requirements

Change-Id: Ifbf10957e1ae193ff57821c95dde97009880d2e7
Merge "Updated from global requirements"