Merge "Fix bug in Value.getBaseline()."
am: baee1502e5

Change-Id: I02a76c24783c88676a356e8a7743b0ae94fec429