Merge "Modify API return type and add callback." am: f96cc08066
am: 9b82062164

Change-Id: I6f54522dba518416445c647a1aaef11caf6865ec