Merge "Track the change to update_engine_sideload path." am: 97de9c3d3e
am: 07c78fe446

Change-Id: I4b0658d1fb7680bac5f48929146b753c14713974