Merge "Add the missing dependency on payload generation script."
am: 3465f2ad56

Change-Id: If1bfc97b7d9d0494ee46b57a086ae0ac89b932aa