Merge "updater: Clean up LoadSrcTgtVersion2()." am: f037b7b535 am: 51159a069d am: 21b5268fbd
am: 67801f2b3a

Change-Id: I94a98c9df68e0bba19aa5a7901a4ce5bb45cfca1