Merge "Bug 9517413: Activity Detection tutorial has errors" into jb-mr2-dev