Fix invalid merge into master branch

Change-Id: Iaf2b741ef9ba66156b52bc0341738712b00e840f
Reviewed-on: https://weave-review.googlesource.com/1624
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
1 file changed