[automerger skipped] Renamed SUB_ID to SUBSCRIPTION_ID am: 4711937bcf am: 9e98a00793 am: 339bc3629e -s ours
am skip reason: Change-Id I47cb8e2072d030a069ec3b95b3ddee739f291222 with SHA-1 fadeaa3708 is in history

Change-Id: I3cd964d4e3fb8cf24efb2432cde39f324789af4c