Note that if this change is reverted or cherry-picked, you must also
include the previous change elaskavaia.cdt@gmail.com as well.

Change-Id: I781fab28ce427874f9d41662a98a1ebfa3840b18