Merge "Extract AppFuse as a util" am: 7be8a7ee1d
am: d04a16cbd5

Change-Id: Ib42c6c546e65ba3d16f489dd86b6849104d73261