[automerger skipped] Merge "More descriptions on SubscriptionController#setPreferredData" am: 16fcd3dc am: 247f18f4 am: 4b61b0bd -s ours Change-Id: I14b83faa3d9d61e3e5de8f3a93a2e7f7104590d0