yaml 10

Change-Id: I7b0d8d27c4a91029e6fcf2d65f5c83c19529e244
Merge remote-tracking branch 'upstream/master'