[automerger skipped] Merge "Fixed CME for SubscriptionController" am: 215bd24a
am: 374c3b96 -s ours
am skip reason: change_id I35d8d3832aad8645ca2161464feaf094ffe4a8cc with SHA1 85d9b6d8 is in history
Change-Id: Ia3a5a178e314dba8cf202849008b24aff66463d5