Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432
am: f82ff97029

Change-Id: I5ccf2e886af1076f0af97b36dc87fbf73501e744