Merge "Signed-off-by: Tiago <tiago.vaz@truphone.com>" am: 9ac55a0a8f am: 74cfb287bb am: 7b2f105083

Change-Id: Ic378cd3d5ea7ed23da98be2e3bae9078715a8984