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

This reverts commit b9574748a4abf6ac921b06a690d766965bc90fca.

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