Change-Id: I597110ee3378ed46ce74a0ceb4bdb4d297c5f9bd Reviewed-by: Simon Hausmann <hausmann@gmail.com>