Sync with global requirements except hacking

Change-Id: I786eb296d19315b563ad99dcad33307e89f60844
Merge "Sync with global requirements except hacking"