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

Change-Id: Ic6ad93cf689235da97b341b850fa3a8c62b71a2e