Merge cherrypicks of [2337578, 2337519] into nyc-mr1-volantis-release

Change-Id: I22f480767c9ca79bae703a24455b3c494115304b