[automerger skipped] Merge "Handle hidden subscriptions for different cases." am: 80edc71e90 am: 5046c4f4eb
am: 383bb58506 -s ours
am skip reason: change_id I9a4cdec1c3e3d00ecd29375f41f433cb6f09ead3 with SHA1 a336e2aa38 is in history

Change-Id: Ie762adf598c7bd9159396a552b0427e75ea09e41