Merge "sdk-img: reset revision to 1" am: c6edc0203e
am: a6c64f769e

Change-Id: Iad53d489465f220cdaadd96d8b23fe3408f42ccc