Using conditional imports where required. Change-Id: If3988443906cd2dd20eac4dde297735a1bf2d1e4 Closes-bug: 1506246