These were necessary only for the Maven based build. Change-Id: Ie26669e6ccae60a52d2db1b8ad362e2fa88a26f2