Merge "update proto py files" am: 4ec81cf1ef
am: dd72857739

Change-Id: I285fb202af8dde225e02e5078f472459230ea2eb