This commit fixes a build error where returned value does not match
defined return type.

Change-Id: I1d2c879d0cf7d90fcc7105683695a371c9fe9f58