Merge "Fix: Double-free error on RemoteFillService" am: 5b04f89343
am: b23ec4eaa7

Change-Id: I3acedf1add384730df6f987b0f20edb77b250228