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

Change-Id: I6b459af4158273e6b2f486989e985e24e3e9d9b0