[automerger skipped] Merge "Make sure IS_EMBEDDED is set properly when adding...
[automerger skipped] Merge "Make sure IS_EMBEDDED is set properly when adding new subscription." am: 55cd6e08 am: c7402777
am: 36a2ef54 -s ours
am skip reason: change_id I45d906c561886f95c9f8d5c6f8b60f08d33c1c45 with SHA1 48d98cdf is in history
Change-Id: Ia4665f952225cc2283678687062e6b001d381792