Merge remote-tracking branch 'gerrit/master'

Change-Id: If8fa36a6a409e6c1e6191111d3ef626ed4595dce