Merge U-Boot v2020.01 into master am: 7e60784b29 am: e08c4cf1a0

Change-Id: I5d48e92ef8f922b38142c3287ddac50acd2d22cb