Merge "Update the copybara config." am: 8c0ae2bc60 am: bfd695e2fb
am: 4851567da6

Change-Id: I494c13ad4a4a54075cf6a1a6cd66f2bc877e9cf3