Partial-Bug: #1250515 author: diane fleming Change-Id: I2378972adfd53803e5b3f7ff46439720d02dfe30 backport: none