Merge "Set revision number to 1 for system images" into lmp-mr1-dev