[automerger skipped] Merge "Fix python proto srczip argument order" into qt-dev
am: cdec2035 -s ours
am skip reason: change_id I62a998f1ad1e3b45f590babbf39330955d368373 with SHA1 09364fd9 is in history
Change-Id: I426b4288a5e74b35b42e3b36e36e29869f0aaba7