Merge "Remove reference to obsolete installation step. am: 17d0ccb1a9" into nyc-mr1-dev