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

Change-Id: I87de2e6bc8f446dc0cddf41cb3e40d76cdc55d98