Merge "Add more comments for resolv apex." am: dd70df2e69
am: 38944bba7f

Change-Id: I0c4f62e58051473bb5b5306526e332ed6ec8a720