[automerger skipped] Merge "Change get sub id list to get sub info list" am: 0c648888ea am: ad58c226ea am: 77daa9a283 -s ours
am skip reason: Change-Id Id9860eb48cffbe6c5517e51d1c6ed29a84997bbd with SHA-1 d6552acf19 is in history

Change-Id: I9df187a9cba6ad61de6cd4485004699cea3352a6