Test: still builds Change-Id: I33b70b0a624b6ab786f4c584592d839309eaac3e Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b