Updated from global requirements

Change-Id: Ibe53f9313ba9badd53582d32267298bee6b0005b
Remove unused log

Change-Id: Ib5dffc82ccfeb1cb7eaba2e5fa583bc97490e6d7
Merge "Updated from global requirements"
Merge "Remove unused log"