Merge "Purr. am: 610f6ede25 am: 0e792f567a" into nyc-mr1-dev-plus-aosp