Updated from global requirements

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