Merge "Make below Intents as protected" am: 4019271077 am: ca7bbb36a5

Change-Id: I6adc7bdb550cb4dd9861217888cb0cceb5a6e87f