Added missing return

Change-Id: I401d9470c03028563de0060391bb9d9e89d507de
Merge "Added missing return"