Updated from global requirements

Change-Id: Idf32e1233efa12843529428102ec630ad275c6cf