Merge "Added missing return." am: 249eeac1ee
am: f0c1179341

Change-Id: I825b7d187e2c6ccc91d96b82ff15a1fa27cc8452