Merge "Update Truphone profiles" am: 36ff2c7706 am: f2931954b9
am: 7409ff57c8

Change-Id: Idbd26a9c3368aa1bcf874cc38f19d0df3e862a75