Merge "partition_tools: Update for auto-slot-suffixing." am: ef055adc78 am: c960f90ae9
am: ddbd38b825

Change-Id: I50cb7506da0981f1d65fdadb9db5097ff3d3f884