Merge "Up to date apps must provide conversation shortcuts" into rvc-dev am:...
Merge "Up to date apps must provide conversation shortcuts" into rvc-dev am: c79df044 am: c7f7d095 am: 706de57a am: f61e4a2d
Change-Id: Ib44066c76ae09a6943c43f5f41e453e98982edd3