Resolve merge errors (oops :P )
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>

Change-Id: I71a23abdf64f68274313526d8631d4bea3e3eb45