Merge "Fix language in packaging file for ContentProviderPaging sample" into oc-dev am: 4686d90d am: 628dbc94 am: 5c4aa9c2 am: 366733b4 Change-Id: Icee4e948f7f68de5cc0fc92464121fb8975fb639