Test: build This reverts commit c03323c8ef. Change-Id: I0cd8b2b409bb4df248d9b9d49a3392a1fe7ecafe
c03323c8ef