gerrithub merged patch set 1, needed 2-6 as well, merging manually

Change-Id: Ia856080709e4d84b03d2e89a54680613f8001996