Merge "ARC++ swap for AppFuseUtil" am: e7a9d5fbbd
am: 5c6aaa3498

Change-Id: Iae3bea0197ca2e42aa4e46558f008ea3b19a28ca