Updated from global requirements

Ib139c1f60fbc91f0354072134bdbc43ed92ae594 is incorrect due to the
hacking version update that needs new checks manual disable.

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