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

Change-Id: I40c87d52909996ff6a1a716452611b65e3fac08f