Merge "Merge "Updating redirects to correct Studio Tips and Tricks am: 8e2431513f am: 908a8703f0 am: c712fdcc45" into nyc-dev am: 79e28a53ea am: 27f5e091d0" into nyc-mr1-dev-plus-aosp