Merge "Don't include patch information when generating images."
am: 48b795efcb

Change-Id: Icca31f1f233afb338244d297a8c60d18594894c5