Test: build This reverts commit 12c625bbf8. Change-Id: I100dc77a8e29ac21ca649d6487563021e8cf0f80
12c625bbf8