Merge cherrypicks of [2666762] into nyc-mr1-volantis-release

Change-Id: I10b4e63bf5043b7bfdb3cd35665fae68381a50f4