More yaml fixes.

Change-Id: I4ac32df9f3790a3a88ebbf4c0a6470872a0cb432