Revert "Merge remote-tracking branch 'gerrit/master' into two_tabs"

This was supposed to merge master into the two_tabs branch, but it was accidently done against master instead

This reverts commit 06ee936e929792fbd74cab519892126b81683a1b.

Change-Id: I98da735b7d5c103399a2478286d1420243df6ba4
Merge "Revert "Merge remote-tracking branch 'gerrit/master' into two_tabs""