R=tpsiaki@google.com, tpsiaki
BUG=none
TESTED=local build still works.

Review URL: https://webrtc-codereview.appspot.com/50329004.