After months of using deprecated components image finally stopped building. Change-Id: I8f5a9b220fc8afd6ef07cb5f2142df8c6ead9bc0 (cherry picked from commit 2c49046ae2)
2c49046ae2