Merge "Added missing return."
am: 249eeac1ee

Change-Id: I11f9b0f7ae120b2687a59e123a7b28d5a4475806