Merge "The index value shall be -1 if there is no relevant application" am: 902fa44011
am: 4df763b290

Change-Id: I11f48f72a98d0fcc5e75b979b512844c23bd1797