tradefederation/contrib: Merge remote-tracking branch 'goog/master' into stage-aosp-master
am: 1c7ed5a6c2

Change-Id: I353424997137b0d98af4f06af89a8987b4a7acb3