Merge "Verify that root digest of hashtree matches the one of APEX" am: 9caccb2675 am: 60dd16428b

Change-Id: I85ce36273f03bc49714dfc089dcd56b857a457a1