Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535
am: 51159a069d

Change-Id: Ia542c58abd931af5f2b0bc089ff2b67886c91070