Merge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev