[automerger skipped] Merge "Modify API return type and add callback." am: f96cc08066 am: 9b82062164
am: 3f0ba8ac68 -s ours
am skip reason: change_id I32fe1407deabe36485227ec75931bec334d85abe with SHA1 1f2850c472 is in history

Change-Id: Ie8b4894d48f1562ed647881a4da15dbc7136c872