This is thanks to a suggestion by Joachim Pouderoux Change-Id: Ia1387b74715dd1be9fd1434ce429c4158782f20b