Merge "Add the missing dependency on payload generation script." am: 3465f2ad56 am: 1f632e7a5e am: 4752d3cbf5
am: 160da45f74

Change-Id: Ie5f47ae20518306e22c977ec36e35c35780d3ea9