Test: Manual, existing tests pass Bug: 64084524 Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2c826d7