Compatibility with Debian and Ubuntu 16.04

Change-Id: I68e80d8be29700bdb4345802f8c0bdb439586e0e
3 files changed