Follow new design patters, fix a return bug

Change-Id: Ia1dcccfcf7120355654a8a2315f26c6e3b819ff6
Signed-off-by: Sol Kavy <skavy@codeaurora.org>
5 files changed