Add return Closes-Bug: 1246356

Change-Id: I70999a91062b9c61e5f420b1ed33a45086b62fd4